diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 978fc6a..ac377d9 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1202,7 +1202,7 @@
 	 */
 	public function limit($value, $offset = FALSE)
 	{
-		$value === NULL OR $this->qb_limit = (int) $value;
+		is_null($value) OR $this->qb_limit = (int) $value;
 		empty($offset) OR $this->qb_offset = (int) $offset;
 
 		return $this;
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 3a38645..997757b 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1335,7 +1335,7 @@
 		for ($i = 0, $c = count($this->_attachments), $z = 0; $i < $c; $i++)
 		{
 			$filename = $this->_attachments[$i]['name'][0];
-			$basename = $this->_attachments[$i]['name'][1] === NULL
+			$basename = ($this->_attachments[$i]['name'][1] === NULL)
 				? basename($filename) : $this->_attachments[$i]['name'][1];
 			$ctype = $this->_attachments[$i]['type'];
 			$file_content = '';